Bug 544510 – SetTimer callback signatures has the wrong type

2008-07-24  Cody Russell  <bratsche@gnome.org>

        Bug 544510 – SetTimer callback signatures has the wrong type

        * gdk/win32/gdkevents-win32.c: Fix modal_timer_proc() and
        sync_timer_proc() to use UINT_PTR for the 'id' parameter
        instead of 'id'.  Patch by Richard Hult.

svn path=/trunk/; revision=20903

diff --git a/ChangeLog b/ChangeLog
index c5bc213349a1d79312f89953dfa403a21dd90028..a3dd598ebca8a9313407488ac71e1ccca41d2a83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-24  Cody Russell  <bratsche@gnome.org>
+
+       Bug 544510 – SetTimer callback signatures has the wrong type
+
+       * gdk/win32/gdkevents-win32.c: Fix modal_timer_proc() and
+       sync_timer_proc() to use UINT_PTR for the 'id' parameter
+       instead of 'id'.  Patch by Richard Hult.
+
 2008-07-23  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 543915 – "Sole completion" translation issue

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 6e3565469137b9841cec1413ded7aea2172457e2..d98f1662ee1a12486b4de3118a33524ba7ceb330 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2033,7 +2033,7 @@ handle_stuff_while_moving_or_resizing (void)
 static VOID CALLBACK
 modal_timer_proc (HWND     hwnd,
                  UINT     msg,
-                 UINT     id,
+                 UINT_PTR id,
                  DWORD    time)
 {
   if (_sizemove_in_progress)
@@ -2041,10 +2041,10 @@ modal_timer_proc (HWND     hwnd,
 }
 
 static VOID CALLBACK
-sync_timer_proc (HWND hwnd,
-                UINT msg,
-                UINT id,
-                DWORD time)
+sync_timer_proc (HWND     hwnd,
+                UINT     msg,
+                UINT_PTR id,
+                DWORD    time)
 {
   MSG message;
   if (PeekMessageW (&message, hwnd, WM_PAINT, WM_PAINT, PM_REMOVE))